From e6de910c4d9c601da9acb710d364ac5f540fc447 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Fri, 2 Mar 2007 15:12:54 +0000 Subject: [PATCH] linux/x86: avoid a re-definition warning on x86-64 and change i386 similarly to be consistent. Signed-off-by: Jan Beulich --- linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S | 2 -- .../arch/x86_64/kernel/head-xen.S | 2 -- .../include/asm-i386/mach-xen/asm/page.h | 15 ++++++++------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S b/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S index 45b6867b68..3d6d430ed8 100644 --- a/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S +++ b/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S @@ -12,8 +12,6 @@ #include #include -#define _PAGE_PRESENT 0x1 - /* * References to members of the new_cpu_data structure. */ diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S b/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S index 3619988fa4..424c1903c9 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/head-xen.S @@ -25,8 +25,6 @@ #include -#define _PAGE_PRESENT 0x1 - .section .bootstrap.text, "ax", @progbits .code64 #define VIRT_ENTRY_OFFSET 0x0 diff --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h index 31ce73e266..40d870c3f0 100644 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h @@ -20,6 +20,14 @@ #define LARGE_PAGE_SIZE (1UL << PMD_SHIFT) #ifdef __KERNEL__ + +/* + * Need to repeat this here in order to not include pgtable.h (which in turn + * depends on definitions made here), but to be able to use the symbolic + * below. The preprocessor will warn if the two definitions aren't identical. + */ +#define _PAGE_PRESENT 0x001 + #ifndef __ASSEMBLY__ #include @@ -29,13 +37,6 @@ #include #include -/* - * Need to repeat this here in order to not include pgtable.h (which in turn - * depends on definitions made here), but to be able to use the symbolic - * below. The preprocessor will warn if the two definitions aren't identical. - */ -#define _PAGE_PRESENT 0x001 - #define arch_free_page(_page,_order) \ ({ int foreign = PageForeign(_page); \ if (foreign) \ -- 2.30.2